Merge branch 'upstream' into 3.09.2rc1
authorJulien Cristau <julien.cristau@ens-lyon.org>
Thu, 30 Mar 2006 15:16:40 +0000 (15:16 +0000)
committerJulien Cristau <julien.cristau@ens-lyon.org>
Thu, 30 Mar 2006 15:16:40 +0000 (15:16 +0000)
commitc622c6cb257aaea1e58f1d983323b4dedd66d557
treeae40e1c7bc38c8c7d773c0427175db81058cadbf
parente631cdea5d4c8cb4562cffe817c3d2477c4b6dd8
parent00f518198d97f3085264ad91fff73a6d1e0430aa
Merge branch 'upstream' into 3.09.2rc1